From cb710820cc495ef1902c1875199de8d096ec5137 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 19 Mar 2009 00:57:57 +0000 Subject: [PATCH] Call create-defualt-fontset, not setup-default-fontset. Call create-fontset-from-fontset-spec within condition-case. --- lisp/term/ns-win.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index a5acf70301f..0786714c538 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -1179,9 +1179,14 @@ See the documentation of `create-fontset-from-fontset-spec for the format.") (if (fboundp 'new-fontset) (progn ;; Setup the default fontset. - (setup-default-fontset) + (create-default-fontset) ;; Create the standard fontset. - (create-fontset-from-fontset-spec ns-standard-fontset-spec t))) + (condition-case err + (create-fontset-from-fontset-spec ns-standard-fontset-spec t) + (error (display-warning + 'initialization + (format "Creation of the standard fontset failed: %s" err) + :error))))) ;;(push (cons 'font "-ns-*-*-*-*-*-10-*-*-*-*-*-fontset-standard") ;; default-frame-alist) -- 2.30.2